解决编译问题
Merge branch 'master' into refs/top-bases/t/3rdTools/mongo-c-driver
Merge commit 'refs/top-bases/t/3rdTools/mongo-c-driver' into t/3rdTools/mongo-c-driver