Merge branch 'privileged-builds' into goodies
Merge branch 'branch-commits' into goodies