mergemaster.sh revision fe0506d7
1