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

Trivial merge