Bumped VERSION to 0.7.21
Updated CHANGELOG
Merge branch 'release/0.7.21' into develop
Bumped development VERSION to 0.8.0