blah
Merge branch 'upmerge' of github.com:mettamara/h-store into upmerge