grammar hack which fixes #600 and fixes #188
Merge branch 'master' of github.com:cwi-swat/rascal