mergemaster.sh revision cf8728a4
1