Backport25/newmatcher

New matcher from MongoDB 2.6