Changes corresponding to ghc trac 8768
Merge pull request #193 from ddssff/master

Changes corresponding to ghc trac 8768