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

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

00:00:18

passed #157460
linux
mat_linux

00:00:29

passed #157459
linux
mat_submodules

00:00:11

passed #157461
linux
mat_windows

00:00:35

 
  Build
passed #157464
linux
exec_debian

00:01:49

passed #157463
linux
exec_linux

00:01:30

passed #157462
vs
exec_windows

00:01:42