Merge branch 'maint-0.2.1' into new