Merge branch 'release-branch-0.2.0'
Merge branch 'release_0.2.1'
Merge branch 'hotfix_0.2.2'
Small fixes to the master branch to compile out of the box again.