Merge remote-tracking branch 'origin/master'
authorRoman Shevchenko <roman.shevchenko@jetbrains.com>
Thu, 30 Jun 2016 12:18:24 +0000 (15:18 +0300)
committerRoman Shevchenko <roman.shevchenko@jetbrains.com>
Thu, 30 Jun 2016 12:18:24 +0000 (15:18 +0300)

Trivial merge