Merge branch '2572_patchfs_space_in_fnames'