Merge branch 'maint-0.3.1' into maint-0.3.2