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

Trivial merge