Changes to ghc

Changes to ghc:
commit c4e9f243398942499c9f5e21318e6ceb048d5880
Author: Simon Peyton Jones <simonpj@microsoft.com>
Date:   Mon Apr 28 08:55:32 2014 +0100

    Test Trac #9036