Closes #2042
Updated Version 3.1.35
Merge branch 'master' into develop

Conflicts:
	version.txt