Merge proposals dependent on lp:~j-harbott/cirros/dev

lp:~j-harbott/cirros/dev has no merge proposals.