Merge proposals dependent on lp:~abentley/launchpad/re-roll-r15692

lp:~abentley/launchpad/re-roll-r15692 has no merge proposals.