should use the right buffer size
Merge branch 'mongodb-master'