Merge remote-tracking branch 'origin/master'
authorRoman Shevchenko <roman.shevchenko@jetbrains.com>
Thu, 10 Dec 2015 19:24:45 +0000 (20:24 +0100)
committerRoman Shevchenko <roman.shevchenko@jetbrains.com>
Thu, 10 Dec 2015 19:24:45 +0000 (20:24 +0100)

Trivial merge