Hotfix for case issue to close #922
Merge branch 'master' into develop

Conflicts:
	version.txt
Merge branch 'develop' into feature-account