Minor changes.
Merge branch 'master' of https://github.com/cwi-swat/rascal-test

Conflicts:
	src/tests/functionality/DataTypeTests.rsc