yojson: propagate build inputs (as in PR #3404)
merlin: update to 1.7
Updates merlin to 1.7.1
Merge pull request #3681 from vbgl/merlin-1.7

Merlin: update to 1.7