Merge remote-tracking branch 'origin/master'
authorRoman Shevchenko <roman.shevchenko@jetbrains.com>
Tue, 14 Oct 2014 16:36:49 +0000 (18:36 +0200)
committerRoman Shevchenko <roman.shevchenko@jetbrains.com>
Tue, 14 Oct 2014 16:36:49 +0000 (18:36 +0200)

Trivial merge