[commit: ghc] wip/T14068: Merge branch 'master' into wip/T14068 (9c6785b)

[git at git.haskell.org]

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

On branch  : wip/T14068
Link       : http://ghc.haskell.org/trac/ghc/changeset/9c6785b5e9d4071ff9deee92afb4fa01555e7358/ghc

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

commit 9c6785b5e9d4071ff9deee92afb4fa01555e7358
Merge: 20b00bd 4ba3bd7
Author: Joachim Breitner <mail at joachim-breitner.de>
Date:   Mon Mar 19 09:53:00 2018 -0400

    Merge branch 'master' 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 9c6785b5e9d4071ff9deee92afb4fa01555e7358