Merge branch 'amakeev/cmake-configs' into amakeev/cmake-configs-master
authorAnton Makeev <Anton.Makeev@jetbrains.com>
Fri, 21 Oct 2016 16:12:04 +0000 (18:12 +0200)
committerAnton Makeev <Anton.Makeev@jetbrains.com>
Fri, 21 Oct 2016 16:12:04 +0000 (18:12 +0200)

Trivial merge