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

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

00:00:19

passed #158030
linux
mat_linux

00:02:35

canceled #158029
linux
mat_submodules

00:07:56

passed #158031
linux
mat_windows

00:00:33

 
  Build
canceled #158034
linux
exec_debian

canceled #158033
linux
exec_linux

canceled #158032
vs
exec_windows