Merge remote-tracking branch 'origin/master'
authorRoman Shevchenko <roman.shevchenko@jetbrains.com>
Tue, 6 Sep 2016 16:45:47 +0000 (19:45 +0300)
committerRoman Shevchenko <roman.shevchenko@jetbrains.com>
Tue, 6 Sep 2016 16:45:47 +0000 (19:45 +0300)

Trivial merge