Merge pull request #5588 from aajanki/encode_frag_filenames