Merge remote-tracking branch 'origin/load-old-database' into load-old-database

Conflicts:
	newsync.bat