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

Trivial merge