Merge remote-tracking branch 'origin/master'
authorRoman Shevchenko <roman.shevchenko@jetbrains.com>
Thu, 16 Oct 2014 18:08:45 +0000 (20:08 +0200)
committerRoman Shevchenko <roman.shevchenko@jetbrains.com>
Thu, 16 Oct 2014 18:08:45 +0000 (20:08 +0200)

Trivial merge