Merge pull request #5512 from cartender/master