Merge proposals dependent on lp:~brandontschaefer/unity/lp.1292647-fixes

lp:~brandontschaefer/unity/lp.1292647-fixes has no merge proposals.