Merge proposals dependent on lp:~robert-ancell/pasaffe/no-lpi

lp:~robert-ancell/pasaffe/no-lpi has no merge proposals.