Merge remote-tracking branch 'upstream/patch_fix_crash_in_nox' into main
authorAlex Schroeder <alex@gnu.org>
Sun, 27 Jun 2021 19:34:28 +0000 (21:34 +0200)
committerAlex Schroeder <alex@gnu.org>
Sun, 27 Jun 2021 19:34:28 +0000 (21:34 +0200)

Trivial merge