Merge pull request #4590 from derrotebaron/master