Merge branch 'master' into server

6 jobs for server in 6 minutes and 36 seconds (queued for 36 seconds)
Status Job ID Name Coverage
  Prepare
passed #12223
linux
mat_linux

00:00:41

passed #12222
linux
mat_lua

00:00:35

passed #12224
linux
mat_windows

00:00:40

 
  Build
passed #12226
linux
exec_linux

00:03:39

passed #12225
vs
exec_windows

00:01:12

 
  Deploy
passed #12227
linux
upload_to_minio

00:00:59