Merge branch 'master' of ssh://git.postgresql.org/pgopen2018
authorSarah Conway <sarah.conway@crunchydata.com>
Tue, 24 Jul 2018 15:51:39 +0000 (08:51 -0700)
committerSarah Conway <sarah.conway@crunchydata.com>
Tue, 24 Jul 2018 15:51:39 +0000 (08:51 -0700)

Trivial merge