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

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

00:00:10

passed #109903
linux
mat_linux

00:00:42

passed #109902
linux
mat_submodules

00:00:29

passed #109904
linux
mat_windows

00:00:14

 
  Build
passed #109907
linux
exec_debian

00:00:55

passed #109906
linux
exec_linux

00:01:44

passed #109905
vs
exec_windows

00:01:17