Merge branch 'master' into lxc_devel - changelog from 2.0-37