Fix a hidden bug
Merge pull request #926 from VoltDB/quick-fix-xin

Fix a hidden bug
Merge pull request #928 from VoltDB/master

back-merge master to branch (prep for final merge)