Merge proposals dependent on lp:~wgrant/launchpad/misc-fixes

lp:~wgrant/launchpad/misc-fixes has no merge proposals.