Merge proposals dependent on lp:~smspillaz/unity/unity.fix_863114

lp:~smspillaz/unity/unity.fix_863114 has no merge proposals.