Hotfix for old style of coldspring integration.
Merge branch 'master' into develop

Conflicts:
	version.txt