Updated version number to 1.0.21
Merge branch 'release/1.0.21' into develop