Merge branch 'c28'

Conflicts:
	testStuff.txt