Merge proposals dependent on lp:~johannes.erdfelt/glance/fix-pip-requires

lp:~johannes.erdfelt/glance/fix-pip-requires has no merge proposals.