Fix CMakeLists.txt
Fix compilation warning for linux/gcc
Merge branch 'master' into ws1314_1
Fix compilation warning for linux/gcc