GG
Merge remote-tracking branch 'origin/master'

Conflicts:
	db.sdf
Revert "GG"

This reverts commit efcccdf2ce7b5b278573ffe3d0e79b2d1b010c57.