Merge remote-tracking branch 'origin/master'
authorRoman Shevchenko <roman.shevchenko@jetbrains.com>
Wed, 3 Sep 2014 18:44:35 +0000 (22:44 +0400)
committerRoman Shevchenko <roman.shevchenko@jetbrains.com>
Wed, 3 Sep 2014 18:44:35 +0000 (22:44 +0400)

Trivial merge