Merge remote-tracking branch 'origin/master' into amakeev/cmake-configs
authorAnton Makeev <Anton.Makeev@jetbrains.com>
Mon, 10 Oct 2016 16:31:15 +0000 (18:31 +0200)
committerAnton Makeev <Anton.Makeev@jetbrains.com>
Mon, 10 Oct 2016 16:31:15 +0000 (18:31 +0200)

Trivial merge