ooooops
Merge branch 'topic-improve-lxc-support' into build