Fix for http://yellowgrass.org/issue/Spoofax/676 (hopefully)
Merge branch 'fix-#676' into spoofax-release