Bump version.
Merge branch 'generation'