Merge remote-tracking branch 'origin/master'
authorRoman Shevchenko <roman.shevchenko@jetbrains.com>
Fri, 11 Mar 2016 12:09:07 +0000 (13:09 +0100)
committerRoman Shevchenko <roman.shevchenko@jetbrains.com>
Fri, 11 Mar 2016 12:09:07 +0000 (13:09 +0100)

Trivial merge