[sr-dev] git:master:167ff2b2: Merge pull request #1672 from sergey-safarov/psql