Closes #1899
Updated Version 3.1.12
Merge branch 'master' into develop

Conflicts:
	version.txt