Merge remote-tracking branch 'origin/master'
authorRoman Shevchenko <roman.shevchenko@jetbrains.com>
Thu, 1 Sep 2016 18:33:37 +0000 (21:33 +0300)
committerRoman Shevchenko <roman.shevchenko@jetbrains.com>
Thu, 1 Sep 2016 18:33:37 +0000 (21:33 +0300)

Trivial merge