Merge pull request #9600 from wankerer/master