Changes to ghc

Changes to ghc:
commit 2d9be8cb1152e78ae2408202663b20bcd9cb8ec2
Author: Simon Peyton Jones <simonpj@microsoft.com>
Date:   Mon Jan 13 12:23:31 2014 +0000

    Test Trac #8616