Merge branch 'maint-0.2.2' into release-0.2.2