Merge remote-tracking branch 'upstream/master' into server-develop

7 jobs for server-develop in 4 minutes and 53 seconds (queued for 3 seconds)
Status Job ID Name Coverage
  Prepare
passed #136484
linux
mat_common

00:00:09

passed #136486
linux
mat_linux

00:02:11

passed #136485
linux
mat_submodules

00:00:32

passed #136487
linux
mat_windows

00:00:11

 
  Build
passed #136490
linux
exec_debian

00:00:41

passed #136489
linux
exec_linux

00:02:41

passed #136488
vs
exec_windows

00:01:38