Merge remote-tracking branch 'origin/master'
authorRoman Shevchenko <roman.shevchenko@jetbrains.com>
Wed, 10 Dec 2014 22:51:29 +0000 (23:51 +0100)
committerRoman Shevchenko <roman.shevchenko@jetbrains.com>
Wed, 10 Dec 2014 22:51:29 +0000 (23:51 +0100)

Trivial merge