Hotfix that Closes #1004
Merge branch 'master' into develop

Conflicts:
	version.txt