There won't be a 3.5.9 release
Merge branch 'QA_3_5' into QA_4_0

Conflicts:
	ChangeLog
Merge branch 'QA_4_0'