Merge proposals dependent on lp:~mcfletch/eric/update-to-4.5.13

lp:~mcfletch/eric/update-to-4.5.13 has no merge proposals.