Merge pull request #5915 from neheb/cifs