Spoofax/840
Merge branch 'master' of https://github.com/metaborg/spoofax