Merge pull request #12232 from neheb/cifs