Merge branch 'master' into v1.4

7 jobs for v1.4 in 10 minutes and 1 second (queued for 43 seconds)