[commit: ghc] wip/T14068: Merge branch 'wip/T14951' into wip/T14068 (4a47fd3)

[git at git.haskell.org]

Repository : ssh://git@git.haskell.org/ghc

On branch  : wip/T14068
Link       : http://ghc.haskell.org/trac/ghc/changeset/4a47fd33d2f16070d4fe8bd32a104587608061cd/ghc

>---------------------------------------------------------------

commit 4a47fd33d2f16070d4fe8bd32a104587608061cd
Merge: c663b71 0aa7d87
Author: Joachim Breitner <mail at joachim-breitner.de>
Date:   Wed Mar 21 17:02:21 2018 -0400

    Merge branch 'wip/T14951' into wip/T14068



>---------------------------------------------------------------


Diff suppressed because of size. To see it, use:

    git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc 4a47fd33d2f16070d4fe8bd32a104587608061cd