Merge branch 'postgres_host' into integration
Use all of my tweaks for our tests