Merge proposals dependent on lp:~townsend/unity/fix-lp1285367

lp:~townsend/unity/fix-lp1285367 has no merge proposals.