Restored reverted merge from https://github.com/jdebrabant/h-store.git