Merge remote-tracking branch 'origin/master'
authorRoman Shevchenko <roman.shevchenko@jetbrains.com>
Fri, 26 Jun 2015 07:57:45 +0000 (10:57 +0300)
committerRoman Shevchenko <roman.shevchenko@jetbrains.com>
Fri, 26 Jun 2015 07:57:45 +0000 (10:57 +0300)

Trivial merge