Merge branch 'release/0.3.5' into master

8 jobs for master in 1 minute and 20 seconds (queued for 40 seconds)