Merge branch 'server' into develop

7 jobs for develop in 3 minutes and 57 seconds (queued for 2 seconds)
Status Job ID Name Coverage
  Prepare
passed #158834
linux
mat_common

00:00:50

passed #158836
linux
mat_linux

00:03:08

passed #158835
linux
mat_submodules

00:02:46

passed #158837
linux
mat_windows

00:00:57

 
  Build
canceled #158840
linux
exec_debian

00:00:47

canceled #158839
linux
exec_linux

00:00:48

canceled #158838
vs
exec_windows