Sync up update-packaging with upstream m-c.