mergemaster.sh revision a7402089
1