Merge pull request #1038 from xsdg/hyphen-filenames.3