Merge pull request #1924 from dibdot/lxc_fix