Merge pull request #3 from VoltDB/master

同步
Merge branch 'ENG-5333-guotong' of https://github.com/VoltDB/voltdb into ENG-5333-guotong
Merge branch 'ENG-5333-guotong' of https://github.com/VoltDB/voltdb into ENG-5333-guotong
hope it works
Merge pull request #1851 from guotong1988/ENG-5333-guotong

thanks for Jia Xin 's help!!