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

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