mergemaster.sh revision 40a39259
1