Merge branch 'master' of https://github.com/postgresopen/pgopen2018
authorSarah Conway <sarah.conway@crunchydata.com>
Tue, 15 May 2018 18:34:20 +0000 (11:34 -0700)
committerSarah Conway <sarah.conway@crunchydata.com>
Tue, 15 May 2018 18:34:20 +0000 (11:34 -0700)

Trivial merge