Bump version to 21
Merge pull request #929 from reciprocity/feature/bump-version-21

Bump version to 21