merge up to ghc HEAD 16-Apr-2011