Merge proposals dependent on lp:~sorrison/glance/dependancy-fixes

lp:~sorrison/glance/dependancy-fixes has no merge proposals.