Merge remote-tracking branch 'origin/amakeev/cmake-iml' into amakeev/appcode-iml appcode/163.4657
authorAnton Makeev <Anton.Makeev@jetbrains.com>
Fri, 16 Sep 2016 13:36:11 +0000 (15:36 +0200)
committerAnton Makeev <Anton.Makeev@jetbrains.com>
Fri, 16 Sep 2016 13:36:11 +0000 (15:36 +0200)

Trivial merge