Merge pull request #2755 from dibdot/lxc