Merge branch 'amakeev/appcode-iml' into amakeev/cmake-configs
authorAnton Makeev <Anton.Makeev@jetbrains.com>
Tue, 11 Oct 2016 15:57:17 +0000 (17:57 +0200)
committerAnton Makeev <Anton.Makeev@jetbrains.com>
Tue, 11 Oct 2016 15:57:17 +0000 (17:57 +0200)

Trivial merge