Merge branch 'maint-0.3.5' into maint-0.4.4

8 jobs for maint-0.4.4 in 21 minutes and 10 seconds (queued for 15 minutes and 44 seconds)