Switch to mongo 2.6.1
Merge branch 't_mongo_2_6_1' into develop