Merge branch 'server' into server-develop

7 jobs for server-develop in 4 minutes and 28 seconds (queued for 5 seconds)
Status Job ID Name Coverage
  Prepare
passed #160107
linux
mat_common

00:00:12

passed #160109
linux
mat_linux

00:00:34

passed #160108
linux
mat_submodules

00:00:13

passed #160110
linux
mat_windows

00:01:55

 
  Build
passed #160113
linux
exec_debian

00:01:36

passed #160112
linux
exec_linux

00:02:30

passed #160111
vs
exec_windows

00:01:33