Merge pull request #1027 from danrl/lxc