Merge remote-tracking branch 'origin/master'
authorRoman Shevchenko <roman.shevchenko@jetbrains.com>
Tue, 6 Sep 2016 09:08:48 +0000 (12:08 +0300)
committerRoman Shevchenko <roman.shevchenko@jetbrains.com>
Tue, 6 Sep 2016 09:08:48 +0000 (12:08 +0300)

Trivial merge