Merge branch 'master' into vasily_pisar/cmake_console