Merge remote-tracking branch 'origin/master'
authorAlexey Utkin <alexey.utkin@jetbrains.com>
Wed, 5 Apr 2017 12:35:20 +0000 (15:35 +0300)
committerAlexey Utkin <alexey.utkin@jetbrains.com>
Wed, 5 Apr 2017 12:35:20 +0000 (15:35 +0300)

Trivial merge