updating merlin to latest
Merge branch 'master' of github.com:novoda/public-mvn-repo