Merge pull request #1203 from gzrp/dev-postgresql