Merge branch 'master' into v1.6

4 jobs for 1.6.2 in 7 minutes and 38 seconds (queued for 2 seconds)
latest