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

[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/5a1b4f814f74ec1c48152d97523744518e212777/ghc

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

commit 5a1b4f814f74ec1c48152d97523744518e212777
Merge: 6757950 808bbdf
Author: Adam Gundry <adam at well-typed.com>
Date:   Fri Oct 16 13:58:52 2015 +0100

    Merge remote-tracking branch 'origin/master' into wip/orf-reboot
    
    Conflicts:
    	compiler/rename/RnNames.hs
    	compiler/typecheck/TcRnMonad.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 5a1b4f814f74ec1c48152d97523744518e212777