Add Generic instances for base types.
Merge branch 'master' into ggp