Merge remote-tracking branch 'origin/master'
authorRoman Shevchenko <roman.shevchenko@jetbrains.com>
Tue, 6 Jan 2015 17:43:16 +0000 (18:43 +0100)
committerRoman Shevchenko <roman.shevchenko@jetbrains.com>
Tue, 6 Jan 2015 17:43:16 +0000 (18:43 +0100)

Trivial merge