Merge pull request #9108 from nijel/patch-1