Connection OK
Merge remote-tracking branch 'origin/next' into next

Conflicts:
	.gitignore