Merge pull request #7740 from davidflanagan/bug833595