Merge branch 'master' into vasily_pisar/cmake_console
authorVasily Pisar <vasily.pisar@jetbrains.com>
Wed, 4 May 2016 08:25:55 +0000 (11:25 +0300)
committerVasily Pisar <vasily.pisar@jetbrains.com>
Wed, 4 May 2016 08:25:55 +0000 (11:25 +0300)

Trivial merge