Merge remote-tracking branch 'origin/master'
authorRoman Shevchenko <roman.shevchenko@jetbrains.com>
Fri, 17 Oct 2014 18:15:47 +0000 (20:15 +0200)
committerRoman Shevchenko <roman.shevchenko@jetbrains.com>
Fri, 17 Oct 2014 18:15:47 +0000 (20:15 +0200)

Trivial merge