Merge branch 'testing' of ssh://git.postgresql.org/pgopen2018-test
authorSarah Conway <sarah.conway@crunchydata.com>
Fri, 27 Jul 2018 19:14:23 +0000 (12:14 -0700)
committerSarah Conway <sarah.conway@crunchydata.com>
Fri, 27 Jul 2018 19:14:23 +0000 (12:14 -0700)

Trivial merge