Merge remote-tracking branch 'origin/master'
authorRoman Shevchenko <roman.shevchenko@jetbrains.com>
Wed, 28 Oct 2015 17:29:23 +0000 (18:29 +0100)
committerRoman Shevchenko <roman.shevchenko@jetbrains.com>
Wed, 28 Oct 2015 17:29:23 +0000 (18:29 +0100)

Trivial merge