Merge remote-tracking branch 'origin/master'
authorRoman Shevchenko <roman.shevchenko@jetbrains.com>
Wed, 13 Apr 2016 11:20:14 +0000 (13:20 +0200)
committerRoman Shevchenko <roman.shevchenko@jetbrains.com>
Wed, 13 Apr 2016 11:20:14 +0000 (13:20 +0200)

Trivial merge