Merge remote-tracking branch 'origin/master'
authorRoman Shevchenko <roman.shevchenko@jetbrains.com>
Tue, 1 Mar 2016 15:33:48 +0000 (16:33 +0100)
committerRoman Shevchenko <roman.shevchenko@jetbrains.com>
Tue, 1 Mar 2016 15:33:48 +0000 (16:33 +0100)

Trivial merge