Merge proposals dependent on lp:~jml/launchpad/ml-links-bug-394133

lp:~jml/launchpad/ml-links-bug-394133 has no merge proposals.