Revert "Merge remote-tracking branch 'upstream/master'"

This reverts commit a55262ee
5 jobs for master in 12 seconds (queued for 3 seconds)
Status Job ID Name Coverage
  Prepare
canceled #210486
linux
dll

00:00:12

 
  Build
canceled #210487
linux
StandaloneLinux64

canceled #210489
linux
StandaloneOSX

canceled #210488
linux
StandaloneWindows64

canceled #210490
linux
resources