Merge branch 'maint-0.4.1' into release-0.4.1