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

Trivial merge