Merge proposals dependent on lp:~shnatsel/gala/fix-1110216

lp:~shnatsel/gala/fix-1110216 has no merge proposals.