Fixed the issue for connections to postgres.
Merge remote-tracking branch 'origin/master'