Merge branch 'master' into char_to_string

Conflicts:
	common/dbcore.h