Merge branch 'build-bot' into bleeding-edge