Merge proposals dependent on lp://staging/~julian-edwards/launchpad/blueprint-30-changes

lp://staging/~julian-edwards/launchpad/blueprint-30-changes has no merge proposals.