emergency fixes
Merge branch 'diffbot' into diffbot-testing

Conflicts:
	Collectiondb.h