Merge pull request #1818 from dibdot/lxc_fix