Add notice about editing merge.sh
Merge branch 'master' into develop