Merge branch 'master' of gitlab.freemud.com:dingda.li/ClientFrame

# Conflicts:
#	ClientFrame/main.cpp
1 job from master in 8 seconds (queued for 2 seconds)
Status Job ID Name Coverage
  Test
failed #9746
windows-runner
analyze

00:08

 
Test analyze
Removing ClientFrame/Debug/
Removing ClientFrame/Release/
Removing Debug/
Removing LastCoverageResults.log
Removing Release/ClientFrame.exe
Removing Release/ClientFrame.pdb
Removing ipch/clientframe-76f33767/
mesg: ttyname failed: Inappropriate ioctl for device
ERROR: Job failed: exit status 1