Merge branch 'master' into python3

4 jobs for python3 in 19 minutes and 30 seconds (queued for 1 second)