Merge branch 'master' into warnings

7 jobs for warnings in 89 minutes and 36 seconds
Status Name Job ID Coverage
  Test
passed clang-c++11-Qt5 #17576
Linux MultiThreads

00:09:33

passed cppcheck #17577
Linux MultiThreads

00:37:19

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

00:57:59

passed Mac-Cpp11 #17581
Apple

00:50:17

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

00:18:16

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

00:17:10

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

00:20:15