mergemaster.sh revision 1317aed7
1