Merge remote-tracking branch 'origin/master' into amakeev/cmake-configs
authorAnton Makeev <Anton.Makeev@jetbrains.com>
Wed, 21 Sep 2016 16:13:24 +0000 (18:13 +0200)
committerAnton Makeev <Anton.Makeev@jetbrains.com>
Wed, 21 Sep 2016 16:13:24 +0000 (18:13 +0200)

Trivial merge