Merge remote-tracking branch 'origin/master'
authorRoman Shevchenko <roman.shevchenko@jetbrains.com>
Mon, 12 Sep 2016 17:34:10 +0000 (20:34 +0300)
committerRoman Shevchenko <roman.shevchenko@jetbrains.com>
Mon, 12 Sep 2016 17:34:10 +0000 (20:34 +0300)

Trivial merge