Merge remote-tracking branch 'origin/master'
authorRoman Shevchenko <roman.shevchenko@jetbrains.com>
Fri, 14 Oct 2016 17:08:58 +0000 (19:08 +0200)
committerRoman Shevchenko <roman.shevchenko@jetbrains.com>
Fri, 14 Oct 2016 17:08:58 +0000 (19:08 +0200)

Trivial merge