Merge branch 'maint-0.4.8' into release-0.4.8