Updated Version 3.4.031
Merge branch 'master' into develop

Conflicts:
	version.txt