Merge branch 'version' into develop

Conflicts:
	vvv