merge master into lxc_devel