Merge branch 'master' into vasily_pisar/cmake_console
authorVasily Pisar <vasily.pisar@jetbrains.com>
Tue, 21 Jun 2016 13:02:52 +0000 (16:02 +0300)
committerVasily Pisar <vasily.pisar@jetbrains.com>
Tue, 21 Jun 2016 13:02:52 +0000 (16:02 +0300)

Trivial merge