Merge pull request #7459 from neheb/psql