Fix conflicting merge
Merge branch 'master' into lxc-support