Merge branch '2015.11-pgsql' into 2015.11
authorPhilipp Schüle <p.schuele@metaways.de>
Wed, 22 Jun 2016 13:31:55 +0000 (15:31 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Wed, 22 Jun 2016 13:31:55 +0000 (15:31 +0200)

Trivial merge