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

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