Merge pull request #4615 from bombizombi/master