Merge pull request #7947 from neheb/sh