Merge pull request #9400 from inondle/master