Fix #569
Merge branch 'master' into db-improvements

Conflicts:
	KMPServer/Server.cs