Closes issue #1990
Updated Version 3.1.22
Merge branch 'master' into develop

Conflicts:
	version.txt