Deermine issue:49160 (different issue this time)
Merge branch 'master' of https://github.com/deerwalk/voltdb