Diff fish-4.0_beta1 with a fish-4.2.0

Thank you!