Fixing the stuff @msteindorfer broke

;-)
Merge branch 'master' of github.com:cwi-swat/rascal