Merge remote-tracking branch 'upstream/master'

8 jobs for master in 91 minutes and 53 seconds (queued for 2 seconds)
latest
Status Job ID Name Coverage
  Prepare
passed #225019
linux
dll

00:02:38

 
  Build
passed #225033
linux
StandaloneLinux64

01:20:11

passed #225035
linux
StandaloneOSX

01:09:22

passed #225034
linux
StandaloneWindows64

01:15:06

passed #225023
linux
resources

00:09:04

failed #225020
linux
StandaloneLinux64

00:44:00

failed #225022
linux
StandaloneOSX

03:59:43

failed #225021
linux
StandaloneWindows64

01:40:34