Merge remote-tracking branch 'origin/master' into amakeev/cmake-iml
authorAnton Makeev <Anton.Makeev@jetbrains.com>
Wed, 31 Aug 2016 17:56:41 +0000 (19:56 +0200)
committerAnton Makeev <Anton.Makeev@jetbrains.com>
Wed, 31 Aug 2016 17:56:41 +0000 (19:56 +0200)

Trivial merge