Merge branch '2800_ftpfs_dir_listing'