Merge remote-tracking branch 'origin/master'
authorRoman Shevchenko <roman.shevchenko@jetbrains.com>
Wed, 8 Jul 2015 13:44:13 +0000 (16:44 +0300)
committerRoman Shevchenko <roman.shevchenko@jetbrains.com>
Wed, 8 Jul 2015 13:44:13 +0000 (16:44 +0300)

Trivial merge