Closes #2269
Updated Version 3.3.012
Merge branch 'master' into develop

Conflicts:
	version.txt