Merge branch '10_fish_whitespace_symlink_issue' into mc-4.6