Merge branch 'sb-200' into sb-202

Conflicts:
	src/dbworker.cpp