[commit: ghc] wip/orf-reboot: Merge remote-tracking branch 'origin/master' into wip/orf-reboot (1b0d5b3)

[git at git.haskell.org]

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

On branch  : wip/orf-reboot
Link       : http://ghc.haskell.org/trac/ghc/changeset/1b0d5b380e2d9c0cff057867f17a1785c4a4c865/ghc

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

commit 1b0d5b380e2d9c0cff057867f17a1785c4a4c865
Merge: e9aab57 74a00bc
Author: Adam Gundry <adam at well-typed.com>
Date:   Thu Jul 16 07:58:08 2015 +0100

    Merge remote-tracking branch 'origin/master' into wip/orf-reboot



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


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 1b0d5b380e2d9c0cff057867f17a1785c4a4c865