Update blahfile

GP-7
Merge branch 'helmut-branch' GP-8

Conflicts:
	blahfile