Bring branch:master up to speed with branch:new-packaging