Merge branch 'python36'

15 jobs for master in 22 minutes and 27 seconds (queued for 166 minutes and 1 second)