Merge proposals dependent on lp:~deryck/launchpad/revert-bug-620458-fix

lp:~deryck/launchpad/revert-bug-620458-fix has no merge proposals.