[commit: ghc] wip/T15050: Merge branch 'master' into wip/T15050 (f20381d)

[git at git.haskell.org]

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

On branch  : wip/T15050
Link       : http://ghc.haskell.org/trac/ghc/changeset/f20381d3431016ee4212f7761992ecc4cfe5440e/ghc

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

commit f20381d3431016ee4212f7761992ecc4cfe5440e
Merge: 2b8eb54 973ff4a
Author: Joachim Breitner <mail at joachim-breitner.de>
Date:   Tue Jul 17 10:54:49 2018 -0400

    Merge branch 'master' into wip/T15050



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


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 f20381d3431016ee4212f7761992ecc4cfe5440e