Proper release of merlin 2
Merge pull request #2988 from trefis/master

Proper release of merlin 2