Mongodb

Merge MongoDB branch into master