Merge remote-tracking branch 'origin/master'
authorRoman Shevchenko <roman.shevchenko@jetbrains.com>
Thu, 22 Sep 2016 11:41:18 +0000 (14:41 +0300)
committerRoman Shevchenko <roman.shevchenko@jetbrains.com>
Thu, 22 Sep 2016 11:41:18 +0000 (14:41 +0300)

Trivial merge