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

7 jobs for server in 5 minutes and 45 seconds (queued for 6 seconds)
Status Job ID Name Coverage
  Prepare
passed #162582
linux
mat_common

00:00:19

passed #162584
linux
mat_linux

00:01:01

passed #162583
linux
mat_submodules

00:01:22

passed #162585
linux
mat_windows

00:00:31

 
  Build
passed #162588
linux
exec_debian

00:01:32

passed #162587
linux
exec_linux

00:04:21

passed #162586
vs
exec_windows

00:01:37