Merge remote-tracking branch 'origin/master'
authorRoman Shevchenko <roman.shevchenko@jetbrains.com>
Tue, 30 Dec 2014 13:21:00 +0000 (14:21 +0100)
committerRoman Shevchenko <roman.shevchenko@jetbrains.com>
Tue, 30 Dec 2014 13:21:00 +0000 (14:21 +0100)

Trivial merge