Merge branch 'refs/heads/master' into develop

Conflicts:
	changelog.txt