Merge branch 'maint-0.3.5' into maint-0.4.4

8 jobs for maint-0.4.4 in 16 minutes and 49 seconds (queued for 33 minutes and 52 seconds)