Merge proposals dependent on lp:~chris.macnaughton/mojo/py3003

lp:~chris.macnaughton/mojo/py3003 has no merge proposals.