Merge proposals dependent on lp://staging/~crass/samhain/trunk

lp://staging/~crass/samhain/trunk has no merge proposals.