Merge branch 'maint-0.4.4' into master

"-s ours" to avoid version bump.
9 jobs for master in 41 minutes and 42 seconds (queued for 314 minutes and 47 seconds)