Merge remote-tracking branch 'origin/master'
authorRoman Shevchenko <roman.shevchenko@jetbrains.com>
Mon, 8 Sep 2014 06:16:20 +0000 (10:16 +0400)
committerRoman Shevchenko <roman.shevchenko@jetbrains.com>
Mon, 8 Sep 2014 06:16:20 +0000 (10:16 +0400)

Trivial merge