Merge remote-tracking branch 'origin/master' into amakeev/cmake-configs-master clion/171.301
authorAnton Makeev <Anton.Makeev@jetbrains.com>
Thu, 20 Oct 2016 18:26:08 +0000 (20:26 +0200)
committerAnton Makeev <Anton.Makeev@jetbrains.com>
Thu, 20 Oct 2016 18:26:08 +0000 (20:26 +0200)

Trivial merge