Merge remote-tracking branch 'origin/master'
authorRoman Shevchenko <roman.shevchenko@jetbrains.com>
Wed, 11 May 2016 09:40:59 +0000 (11:40 +0200)
committerRoman Shevchenko <roman.shevchenko@jetbrains.com>
Wed, 11 May 2016 09:40:59 +0000 (11:40 +0200)

Trivial merge