Changes to ghc

Changes to ghc:
commit 616f54bdc28ad699f903248a5fb18dc0e5b52a52
Author: Simon Peyton Jones <simonpj@microsoft.com>
Date:   Thu Jun 5 12:26:24 2014 +0100

    Test Trac #9023