[Merge] ~xnox/livecd-rootfs:fix-x13s-try2 into livecd-rootfs:ubuntu/master

[Dimitri John Ledkov]

Matching ubuntu-cdimage commit https://git.launchpad.net/~xnox/ubuntu-cdimage/commit/?id=df44887671f272a8fbbbd7ece3874dcf2cd2bf1c
-- 
https://code.launchpad.net/~xnox/livecd-rootfs/+git/livecd-rootfs/+merge/452427
Your team Ubuntu Core Development Team is subscribed to branch livecd-rootfs:ubuntu/master.