Merlin file
Remove unneeded merlin dependencies
Merge pull request #454 from mark-christiaens/1.6_merlin

1.6 merlin