merged master into lxc_devel