...
Merge branch 'master' into release/v1

Conflicts:
	.gitignore
Merge branch 'release/v1' into develop