Merge remote-tracking branch 'origin/master'
authorRoman Shevchenko <roman.shevchenko@jetbrains.com>
Thu, 3 Jul 2014 18:21:17 +0000 (20:21 +0200)
committerRoman Shevchenko <roman.shevchenko@jetbrains.com>
Thu, 3 Jul 2014 18:21:17 +0000 (20:21 +0200)

Trivial merge