fix for issue #2040
Updated Version 3.1.30
Merge branch 'master' into develop

Conflicts:
	version.txt