Merge branch 'release/0.3.6'

8 jobs for master in 2 minutes and 1 second (queued for 3 seconds)