Hydra doesn't like the diamond
Merge branch 'master' of github.com:metaborg/spoofax