[commit: haddock] ghc-head, ghc-head1, ie_avails, wip/revert-ttg-2017-11-20, wip/ttg-2017-10-13, wip/ttg-2017-10-31, wip/ttg-2017-11-06, wip/ttg2-2017-11-10, wip/ttg3-2017-11-12, wip/ttg4-constraints-2017-11-13: Merge remote-tracking branch 'origin/master' into ghc-head (7a71af8)

[git at git.haskell.org]

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

On branches: ghc-head,ghc-head1,ie_avails,wip/revert-ttg-2017-11-20,wip/ttg-2017-10-13,wip/ttg-2017-10-31,wip/ttg-2017-11-06,wip/ttg2-2017-11-10,wip/ttg3-2017-11-12,wip/ttg4-constraints-2017-11-13
Link       : http://git.haskell.org/haddock.git/commitdiff/7a71af839bd71992a36d97650004c73bf11fa436

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

commit 7a71af839bd71992a36d97650004c73bf11fa436
Merge: c8a01b8 740458a
Author: alexbiehl <alex.biehl at gmail.com>
Date:   Mon Aug 21 20:05:42 2017 +0200

    Merge remote-tracking branch 'origin/master' into ghc-head



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


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 7a71af839bd71992a36d97650004c73bf11fa436