Potential Hotfix for issue #1006
Merge branch 'master' into develop

Conflicts:
	version.txt