mongo 2.0 work
Merge branch 'master' into 1.0