Merge remote-tracking branch 'origin/master'
authorRoman Shevchenko <roman.shevchenko@jetbrains.com>
Thu, 17 Mar 2016 10:51:08 +0000 (11:51 +0100)
committerRoman Shevchenko <roman.shevchenko@jetbrains.com>
Thu, 17 Mar 2016 10:51:08 +0000 (11:51 +0100)

Trivial merge