Merge remote-tracking branch 'upstream/master'

5 jobs for master in 15 seconds (queued for 4 seconds)
latest
Status Job ID Name Coverage
  Prepare
canceled #221365
linux
dll

00:00:15

 
  Build
canceled #221366
linux
StandaloneLinux64

canceled #221368
linux
StandaloneOSX

canceled #221367
linux
StandaloneWindows64

canceled #221369
linux
resources