[commit: ghc] wip/hasfield: Merge remote-tracking branch 'origin/master' into wip/hasfield (4dd3636)

[git at git.haskell.org]

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

On branch  : wip/hasfield
Link       : http://ghc.haskell.org/trac/ghc/changeset/4dd3636f46ed0a413ccc554d413fd163975d2781/ghc

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

commit 4dd3636f46ed0a413ccc554d413fd163975d2781
Merge: b50eb34 46b78e6
Author: Adam Gundry <adam at well-typed.com>
Date:   Sat Oct 8 11:39:48 2016 +0100

    Merge remote-tracking branch 'origin/master' into wip/hasfield
    
    Conflicts:
    	compiler/hsSyn/PlaceHolder.hs
    	compiler/prelude/PrelNames.hs
    	compiler/typecheck/TcEvidence.hs
    	compiler/typecheck/TcInteract.hs
    	compiler/typecheck/TcSMonad.hs
    	testsuite/tests/overloadedrecflds/should_run/all.T



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


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 4dd3636f46ed0a413ccc554d413fd163975d2781