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

[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/baadd78165651e9352a5d331246ddd987552ec17/ghc

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

commit baadd78165651e9352a5d331246ddd987552ec17
Merge: 6b31bfe a52db23
Author: Adam Gundry <adam at well-typed.com>
Date:   Fri Oct 2 19:43:21 2015 +0100

    Merge remote-tracking branch 'origin/master' into wip/orf-reboot
    
    Conflicts:
    	compiler/basicTypes/DataCon.hs-boot
    	compiler/deSugar/MatchCon.hs
    	compiler/ghc.cabal.in
    	compiler/ghc.mk
    	compiler/hsSyn/Convert.hs
    	compiler/hsSyn/HsImpExp.hs
    	compiler/hsSyn/HsTypes.hs
    	compiler/hsSyn/PlaceHolder.hs
    	compiler/iface/BuildTyCl.hs
    	compiler/iface/TcIface.hs
    	compiler/parser/RdrHsSyn.hs
    	compiler/rename/RnExpr.hs
    	compiler/rename/RnNames.hs
    	compiler/typecheck/TcEnv.hs
    	compiler/typecheck/TcExpr.hs
    	compiler/typecheck/TcTyClsDecls.hs
    	testsuite/tests/driver/T4437.hs
    	utils/haddock



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


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 baadd78165651e9352a5d331246ddd987552ec17