Bumps version to 0.1.21
Merges branch 'release/0.1.21' into develop