Merge proposals dependent on lp:~dcaro/bzr/fix-1008223

lp:~dcaro/bzr/fix-1008223 has no merge proposals.