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

Trivial merge