Merge proposals dependent on lp:~aacid/unity-2d/use_icon_that_we_get

lp:~aacid/unity-2d/use_icon_that_we_get has no merge proposals.