Merge proposals dependent on lp:~peterlevi/variety/master

lp:~peterlevi/variety/master has no merge proposals.