[sr-dev] git:5.1:547f3dfa: Merge pull request #1925 from sergey-safarov/pg_make