[Merge] ~mwhudson/livecd-rootfs/+git/livecd-rootfs:lp-2028862 into livecd-rootfs:ubuntu/master

[Michael Hudson-Doyle]

(my head hurts)
-- 
https://code.launchpad.net/~mwhudson/livecd-rootfs/+git/livecd-rootfs/+merge/448655
Your team Ubuntu Core Development Team is requested to review the proposed merge of ~mwhudson/livecd-rootfs/+git/livecd-rootfs:lp-2028862 into livecd-rootfs:ubuntu/master.