Merge branch 'master' into ENG-4873
Merge branch 'master' into ENG-4873
Merge pull request #661 from VoltDB/ENG-4873

Eng 4873 - merge after.