Merge remote-tracking branch 'origin/master'
authorRoman Shevchenko <roman.shevchenko@jetbrains.com>
Thu, 18 Feb 2016 17:59:13 +0000 (18:59 +0100)
committerRoman Shevchenko <roman.shevchenko@jetbrains.com>
Thu, 18 Feb 2016 17:59:13 +0000 (18:59 +0100)

Trivial merge