Fixed build breakage
Merge branch 'master' of https://github.com/tbertore/Mercury