Merge remote-tracking branch 'origin/master' rubymine/142.412
authorRoman Shevchenko <roman.shevchenko@jetbrains.com>
Mon, 23 Mar 2015 18:36:00 +0000 (19:36 +0100)
committerRoman Shevchenko <roman.shevchenko@jetbrains.com>
Mon, 23 Mar 2015 18:36:00 +0000 (19:36 +0100)

Trivial merge