Merge proposals dependent on lp:~barry/launchpad/416703-sprints

lp:~barry/launchpad/416703-sprints has no merge proposals.