Merge branch 'master' of c:/code/HEAD-git/. into ghc-generics