Merge branch 'master' into bsp-fix-attempt

6 jobs for bsp-fix-attempt in 90 minutes and 46 seconds (queued for 2 seconds)
Status Name Job ID Coverage
  Test
passed clang-c++11-Qt5 #14068
Linux MultiThreads

00:08:51

failed cppcheck #14069
Linux MultiThreads

00:40:19

passed gcc-c++11-Qt5 #14067
Linux

00:03:51

passed VS2013-Qt-5.5.1-x64 #14072
VS2013 Qt551

00:21:56

passed VS2015-Qt-5.6.0-x32 #14071
VS2015 Qt56

00:17:26

passed VS2015-Qt-5.6.0-x64 #14070
VS2015 Qt56

00:21:52

 
Name Stage Failure
failed
cppcheck Test There is an unknown failure, please try again

==============================================================================
CPPCHECK Summary
==============================================================================


Total CPPCHECK error Count is 51, which is too High! CPPCHECK Run failed

ERROR: Build failed: exit status 1