[commit: ghc] wip/T11067: Merge remote-tracking branch 'origin/master' into wip/T11067 (8e021c4)

[git at git.haskell.org]

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

On branch  : wip/T11067
Link       : http://ghc.haskell.org/trac/ghc/changeset/8e021c43c0eea4ca36dbc2867cdc1475cae9a36c/ghc

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

commit 8e021c43c0eea4ca36dbc2867cdc1475cae9a36c
Merge: 96eac39 741f837
Author: Simon Peyton Jones <simonpj at microsoft.com>
Date:   Wed Dec 2 14:31:35 2015 +0000

    Merge remote-tracking branch 'origin/master' into wip/T11067
    
    Conflicts:
    	testsuite/tests/indexed-types/should_fail/T1897b.stderr
    	testsuite/tests/partial-sigs/should_compile/ExtraConstraints3.stderr
    	testsuite/tests/partial-sigs/should_compile/WarningWildcardInstantiations.stderr
    	testsuite/tests/partial-sigs/should_fail/InstantiatedNamedWildcardsInConstraints.stderr
    	testsuite/tests/partial-sigs/should_fail/WildcardInstantiations.stderr
    	testsuite/tests/typecheck/should_compile/T9939.stderr
    	testsuite/tests/typecheck/should_fail/CustomTypeErrors02.stderr
    	testsuite/tests/typecheck/should_fail/T8883.stderr



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


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 8e021c43c0eea4ca36dbc2867cdc1475cae9a36c