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

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