Merge remote-tracking branch 'origin/master'
authorRoman Shevchenko <roman.shevchenko@jetbrains.com>
Tue, 28 Jul 2015 18:00:36 +0000 (20:00 +0200)
committerRoman Shevchenko <roman.shevchenko@jetbrains.com>
Tue, 28 Jul 2015 18:00:36 +0000 (20:00 +0200)

Trivial merge