Merge pull request #9414 from mikeller/add_revision_to_filenames