Merge branch 'wip/backport-MR951' into wip/ghc-8.8-merges
authorBen Gamari <ben@smart-cactus.org>
Fri, 21 Jun 2019 21:17:46 +0000 (17:17 -0400)
committerBen Gamari <ben@smart-cactus.org>
Fri, 21 Jun 2019 21:17:46 +0000 (17:17 -0400)

Trivial merge