Merge branch 'da/mergetools-meld-output-opt-on-macos' into maint