Merge pull request #9025 from tschuettler/patch-8