Merge remote-tracking branch 'origin/master' into test/selenium

2 jobs for test/selenium in 2 minutes and 53 seconds (queued for 1 second)