Merge remote-tracking branch 'origin/master'
authorAnton Makeev <Anton.Makeev@jetbrains.com>
Thu, 4 Feb 2016 16:01:52 +0000 (17:01 +0100)
committerAnton Makeev <Anton.Makeev@jetbrains.com>
Thu, 4 Feb 2016 16:01:52 +0000 (17:01 +0100)

Trivial merge