Merge branch 'master' into lxc_devel