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

[git at git.haskell.org]

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

On branch  : wip/T11067
Link       : http://ghc.haskell.org/trac/ghc/changeset/821c043a18c38a1b9229054471efa112c642c696/ghc

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

commit 821c043a18c38a1b9229054471efa112c642c696
Merge: 9acb570 04e1c27
Author: Simon Peyton Jones <simonpj at microsoft.com>
Date:   Mon Dec 7 16:10:43 2015 +0000

    Merge remote-tracking branch 'origin/master' into wip/T11067
    
    Conflicts:
    	compiler/utils/Bag.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 821c043a18c38a1b9229054471efa112c642c696