Merge branch 'master' into vasily_pisar/cmake_console
authorVasily Pisar <vasily.pisar@jetbrains.com>
Mon, 20 Jun 2016 16:22:02 +0000 (19:22 +0300)
committerVasily Pisar <vasily.pisar@jetbrains.com>
Mon, 20 Jun 2016 16:22:02 +0000 (19:22 +0300)

Trivial merge