Merge branch 'python36'

15 jobs for master in 15 minutes and 39 seconds (queued for 32 minutes and 15 seconds)