Merge remote-tracking branch 'origin/master'
authorRoman Shevchenko <roman.shevchenko@jetbrains.com>
Thu, 8 Sep 2016 09:43:38 +0000 (12:43 +0300)
committerRoman Shevchenko <roman.shevchenko@jetbrains.com>
Thu, 8 Sep 2016 09:43:38 +0000 (12:43 +0300)

Trivial merge