Merge remote-tracking branch 'origin/master'
authorRoman Shevchenko <roman.shevchenko@jetbrains.com>
Tue, 12 Jul 2016 10:13:23 +0000 (12:13 +0200)
committerRoman Shevchenko <roman.shevchenko@jetbrains.com>
Tue, 12 Jul 2016 10:13:23 +0000 (12:13 +0200)

Trivial merge