[GHC] #11595: Merge some TypeInType fixes

[GHC]

#11595: Merge some TypeInType fixes
-------------------------------------+-------------------------------------
        Reporter:  goldfire          |                Owner:
            Type:  task              |               Status:  closed
        Priority:  normal            |            Milestone:  8.0.1
       Component:  Compiler          |              Version:  8.1
      Resolution:  fixed             |             Keywords:
Operating System:  Unknown/Multiple  |         Architecture:
                                     |  Unknown/Multiple
 Type of failure:  None/Unknown      |            Test Case:
      Blocked By:                    |             Blocking:
 Related Tickets:                    |  Differential Rev(s):
       Wiki Page:                    |
-------------------------------------+-------------------------------------
Changes (by bgamari):

 * status:  merge => closed
 * resolution:   => fixed


Comment:

 Merged.

 ||= `master` =||= `ghc-8.0` =||
 || b962bcc609cf3239d61ba281ca0eccc3cd89d99d ||
 01d00798aae96af9e58e5f115e9dec93bf0c2baf ||
 || 90f35612f16ff9cb2466cc936f12e748402abb85 ||
 31ab4b6b40f5f411b2e178df5916ae7e88343079 ||
 || aff5bb47b70450bb1e3e4ac3c18ea35d13f9ac7c ||
 c88cd459c97b0c32221721e75c823c8a7064b0a1 ||
 || 7d8031ba3d36a9378a40834aa3e3817d8f7f310f ||
 e1631b3b58b7440d3d5a8bf72f1490df635792fb ||
 || 6f952f58bc4d592265134e4e13af46da9c56560f ||
 3b80156c4c921a44f917d0e666e4f74137fbffb4 ||

--
Ticket URL: <http://ghc.haskell.org/trac/ghc/ticket/11595#comment:2>
GHC <http://www.haskell.org/ghc/>
The Glasgow Haskell Compiler