Merge branch 'rs/git-gui-use-modern-git-merge-syntax' into maint