Merge remote-tracking branch 'upstream/master'

5 jobs for master in 74 minutes and 35 seconds (queued for 1 second)
Status Job ID Name Coverage
  Prepare
passed #221300
linux
dll

00:00:42

 
  Build
passed #221301
linux
StandaloneLinux64

00:55:25

passed #221303
linux
StandaloneOSX

01:13:53

passed #221302
linux
StandaloneWindows64

01:08:48

passed #221304
linux
resources

00:11:26