Merge branch 'haskell-updates' into stdenv-updates.