refs #787 Fix the fix, add a test case.
Merge branch 'master' of github.com:Tokutek/mongo