Merge pull request #1920 from dibdot/lxc_fix