Merge pull request #31 from xtuple/master

Catch up.
Merge pull request #32 from xtuple/master

Catch up.
issue #19456: Tweak
Merge branch 'master' of github.com:jrogelstad/database
Merge pull request #243 from jrogelstad/master

issue #19456: Tweak