Merge improvements from travisci_pgsql_crash branch.