Merge remote-tracking branch 'origin/play' into play

Conflicts:
	database/main.h2.db
	database/main.lock.db