Merge remote-tracking branch 'origin/clientonly'

Conflicts:
	.gitignore