Merge branch 'master' into daywalker/cmake_editing clion/146.1343 clion/146.1362 clion/146.1491 clion/146.1496
authorVasily Pisar <vasily.pisar@jetbrains.com>
Mon, 18 Apr 2016 10:07:33 +0000 (13:07 +0300)
committerVasily Pisar <vasily.pisar@jetbrains.com>
Mon, 18 Apr 2016 10:07:33 +0000 (13:07 +0300)

Trivial merge