Copy new buildscripts
Don't know how this got switched.
Rename script
Merge remote-tracking branch 'upstream/jb-mr1' into jb-mr1