[Merge] ~xubuntu-dev/livecd-rootfs:xubuntu-live-installer-fix into livecd-rootfs:ubuntu/master

[Paul Mars]

By the way we do have the two spellings of this word in the project. I suppose that is not the first time someone is tripping over this so we might want to settle on one of them.
-- 
https://code.launchpad.net/~xubuntu-dev/livecd-rootfs/+git/livecd-rootfs/+merge/460899
Your team Ubuntu Core Development Team is subscribed to branch livecd-rootfs:ubuntu/master.