mergemaster.sh revision bc1b4f78
1