Merge remote-tracking branch 'origin/master' into elastic_7

6 jobs for elastic_7 in 31 minutes and 38 seconds (queued for 2 seconds)