Merge remote-tracking branch 'origin/master'
authorRoman Shevchenko <roman.shevchenko@jetbrains.com>
Mon, 18 Aug 2014 17:28:32 +0000 (21:28 +0400)
committerRoman Shevchenko <roman.shevchenko@jetbrains.com>
Mon, 18 Aug 2014 17:28:32 +0000 (21:28 +0400)

Trivial merge