Merge branch 'ghc-generics'