Merge branch 'release/1.0.20' into develop
Fixes `_git-merge-from-upstream:5: command not found: gm`
Bumps to version 1.0.21
Merge branch 'release/1.0.21'