Merge branch 'master' into server

6 jobs for server in 3 minutes and 2 seconds (queued for 1 second)
Status Job ID Name Coverage
  Prepare
passed #13805
linux
mat_linux

00:01:04

passed #13804
linux
mat_lua

00:00:26

passed #13806
linux
mat_windows

00:00:29

 
  Build
passed #13808
linux
exec_linux

00:00:37

passed #13807
vs
exec_windows

00:00:50

 
  Deploy
passed #13809
linux
upload_to_minio

00:00:30