Diff fish-3.6.1 with a fish-4.0_beta1

Thank you!