Merge remote-tracking branch 'origin/cherry-pick-43a43a33' into wip/ghc-8.8-merges
authorBen Gamari <ben@smart-cactus.org>
Tue, 4 Jun 2019 22:01:54 +0000 (18:01 -0400)
committerBen Gamari <ben@smart-cactus.org>
Tue, 4 Jun 2019 22:01:54 +0000 (18:01 -0400)

Trivial merge