Merge branch 'master' into build-lxc-rootfs
Like I said - barring any bugs.
Merge branch 'build-lxc-rootfs' into tsp-demo