Merge pull request #19 from cfwheels/master

pull from upstream
Merge pull request #20 from cfwheels/master

pull from upstream
unit tests fixes backported from 1.2 branch for issue #236
Merge pull request #249 from scahyono/master-db-test-fix

Master db test fix for PostgreSQL and Oracle