Merge pull request #1808 from dibdot/lxc_fix