Needed at Merthyr
Tweak trinidad conf
Merge branch 'master' of https://github.com/sdc/leap