Merge remote-tracking branch 'origin/master'
authorRoman Shevchenko <roman.shevchenko@jetbrains.com>
Mon, 5 Sep 2016 09:21:45 +0000 (12:21 +0300)
committerRoman Shevchenko <roman.shevchenko@jetbrains.com>
Mon, 5 Sep 2016 09:21:45 +0000 (12:21 +0300)

Trivial merge