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

Trivial merge