Merge branch 'master' into release

Conflicts:
	README.md
Merge branch 'develop'
Merge branch 'master' into release