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

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

00:01:22

passed #140451
linux
mat_linux

00:00:50

passed #140450
linux
mat_submodules

00:01:30

passed #140452
linux
mat_windows

00:01:24

 
  Build
passed #140455
linux
exec_debian

00:01:04

passed #140454
linux
exec_linux

00:01:50

passed #140453
vs
exec_windows

00:01:29