Merge remote-tracking branch 'origin/master'
authorAnton Makeev <Anton.Makeev@jetbrains.com>
Thu, 7 Apr 2016 13:49:10 +0000 (15:49 +0200)
committerAnton Makeev <Anton.Makeev@jetbrains.com>
Thu, 7 Apr 2016 13:49:10 +0000 (15:49 +0200)

Trivial merge