Merge pull request #5448 from clayface/master