Merge pull request #1851 from dibdot/lxc_fix