[commit: ghc] wip/perf-testsuite: Merge remote-tracking branch 'origin/master' into wip/perf-testsuite (7d0754a)

[git at git.haskell.org]

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

On branch  : wip/perf-testsuite
Link       : http://ghc.haskell.org/trac/ghc/changeset/7d0754a95b01abc7ed36624821e367648d873ad6/ghc

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

commit 7d0754a95b01abc7ed36624821e367648d873ad6
Merge: cf2669b d08b9cc
Author: Jared Weakly <jweakly at pdx.edu>
Date:   Fri Jul 28 13:28:29 2017 -0700

    Merge remote-tracking branch 'origin/master' into wip/perf-testsuite



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


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