Fix namespace
Fix mongo
Merge remote-tracking branch 'origin/2.0' into 2.3

Conflicts:
	Document/AssociatedThread.php
Merge 2.0