Merge pull request #5790 from micmac1/postgresql-fixes
authorDaniel Golle <dangowrt@users.noreply.github.com>
Mon, 26 Mar 2018 22:54:03 +0000 (00:54 +0200)
committerGitHub <noreply@github.com>
Mon, 26 Mar 2018 22:54:03 +0000 (00:54 +0200)
Postgresql fixes


Trivial merge