mergemaster.sh revision b3559845
1