Merge branches 'master' and 'powerTuples' of https://github.com/cwi-swat/rascal into powerTuples