Merge branch 'master' into vasily_pisar/cmake_console
authorVasily Pisar <vasily.pisar@jetbrains.com>
Wed, 8 Jun 2016 15:54:04 +0000 (18:54 +0300)
committerVasily Pisar <vasily.pisar@jetbrains.com>
Wed, 8 Jun 2016 15:54:04 +0000 (18:54 +0300)

Trivial merge