Merge remote-tracking branch 'origin/master'
authorRoman Shevchenko <roman.shevchenko@jetbrains.com>
Fri, 16 Sep 2016 07:40:07 +0000 (10:40 +0300)
committerRoman Shevchenko <roman.shevchenko@jetbrains.com>
Fri, 16 Sep 2016 07:40:07 +0000 (10:40 +0300)

Trivial merge