Merge branch 'release/yet-more-testing' into production
Bumping version to 0.2.1.
Adding line to CHANGELOG: * test hotfix merging
Merge branch 'hotfix/test-hotfix-merging'