Merge remote-tracking branch 'pgopen2018-craig/master' into testing
authorStephen Frost <sfrost@snowman.net>
Fri, 8 Jun 2018 15:15:14 +0000 (11:15 -0400)
committerStephen Frost <sfrost@snowman.net>
Fri, 8 Jun 2018 15:15:14 +0000 (11:15 -0400)

Trivial merge