Merge branch 'maint-0.4.4' into master

9 jobs for master