Merge branch 'master' into pkg_mgmt