Merge master f9e94873d862c9a44f25a56ed2e19b609571e7b8 into lxc branch