Merge remote-tracking branch 'origin/master'
authorRoman Shevchenko <roman.shevchenko@jetbrains.com>
Wed, 27 Aug 2014 06:56:27 +0000 (10:56 +0400)
committerRoman Shevchenko <roman.shevchenko@jetbrains.com>
Wed, 27 Aug 2014 06:56:27 +0000 (10:56 +0400)

Trivial merge