Merge remote-tracking branch 'origin/master'
authorRoman Shevchenko <roman.shevchenko@jetbrains.com>
Thu, 29 Sep 2016 16:36:36 +0000 (18:36 +0200)
committerRoman Shevchenko <roman.shevchenko@jetbrains.com>
Thu, 29 Sep 2016 16:36:36 +0000 (18:36 +0200)

Trivial merge