Merge remote-tracking branch 'origin/master' into amakeev/cmake-iml
authorAnton Makeev <Anton.Makeev@jetbrains.com>
Wed, 24 Aug 2016 12:45:01 +0000 (14:45 +0200)
committerAnton Makeev <Anton.Makeev@jetbrains.com>
Wed, 24 Aug 2016 12:45:01 +0000 (14:45 +0200)

Trivial merge