Merge branch 'lxc' into lxc_devel