Merge remote-tracking branch 'origin/master'
authorRoman Shevchenko <roman.shevchenko@jetbrains.com>
Tue, 3 Feb 2015 20:17:21 +0000 (23:17 +0300)
committerRoman Shevchenko <roman.shevchenko@jetbrains.com>
Tue, 3 Feb 2015 20:17:21 +0000 (23:17 +0300)

Trivial merge