Merge branch 'maint-0.4.4' into maint-0.4.5