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

Trivial merge