Merge remote-tracking branch 'origin/V1'

Conflicts:
	.gitignore