Merge branch 'master' into bsp-fix-attempt

6 jobs for bsp-fix-attempt in 65 minutes and 22 seconds (queued for 1 second)
Status Name Job ID Coverage
  Test
passed clang-c++11-Qt5 #14144
Linux MultiThreads

00:08:57

passed cppcheck #14145
Linux MultiThreads

00:36:22

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

00:04:17

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

00:21:18

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

00:18:37

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

00:22:05