Fixed a crash some Gopal changes
Merge branch 'master' of https://github.com/mghosh4/mongo