This was just committed
Merge branch 'gerhard' into development

Conflicts:
	Junk.txt