Version bump.
Merge branch 'release/0.3.21' into develop