Merge branch 'master' into daywalker/cmake_editing
authorVasily Pisar <vasily.pisar@jetbrains.com>
Wed, 27 Apr 2016 12:56:35 +0000 (15:56 +0300)
committerVasily Pisar <vasily.pisar@jetbrains.com>
Wed, 27 Apr 2016 12:56:35 +0000 (15:56 +0300)

Trivial merge