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

[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/18bd41c9927dec764075c29d752c13b696755981/ghc

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

commit 18bd41c9927dec764075c29d752c13b696755981
Merge: 97fd90b daa5097
Author: Adam Gundry <adam at well-typed.com>
Date:   Wed Jul 1 14:58:46 2015 +0100

    Merge remote-tracking branch 'origin/master' into wip/orf-reboot
    
    Conflicts:
    	compiler/hsSyn/HsExpr.hs
    	compiler/rename/RnEnv.hs
    	compiler/rename/RnExpr.hs



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


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 18bd41c9927dec764075c29d752c13b696755981