Merge proposals dependent on lp:~joshuascotton/glitter/working

lp:~joshuascotton/glitter/working has no merge proposals.