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

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