CHANGES file updated
Merge branch 'akoepsel/devel-0.5/issue_rofl_40' into akoepsel/devel-0.6/issue_rofl_40

Conflicts:
	CHANGES