Merge proposals dependent on lp:~cjohnston/summit/1002220

lp:~cjohnston/summit/1002220 has no merge proposals.