Merge upstream/main into fix/ripple-delete

Conflicts:
- contributors/people.toml: keep both new entries (maxm11, ossini)
- timeline.rs: take upstream's Alt-click through timeline.select (it
  clears the gap selection), and its empty-space arm (#683); only an
  empty stretch of a track selects a gap

contributors/people.toml

@@ -57,5 +57,10 @@ sync_github_name = false
 [people.liangforstudy]
 sync_github_name = true
 
+[people.maxm11]
+real_name = "Max Murphy"
+display_name = "Max Murphy"
+sync_github_name = false
+
 [people.ossini]
 sync_github_name = true