Merge pull request #655 from VoltDB/ENG-4873

Eng 4873 - merged
Merge branch 'master' into ENG-4873