Merge branch 'main' into mh/mark

.mailmap

@@ -3,7 +3,7 @@ Stuart Burrell <stuartburrell1994@gmail.com> stuartburrell <unknown>
 Reinis Cirpons <rc234@st-andrews.ac.uk> Reinis Cirpons <43414125+reiniscirpons@users.noreply.github.com>
 Reinis Cirpons <rc234@st-andrews.ac.uk> reiniscirpons <rc234@st-andrews.ac.uk>
 Tom Conti-Leslie <tom.contileslie@gmail.com> Tom Conti-Leslie <54725378+tomcontileslie@users.noreply.github.com>
-Joe Edwards <je53@st-andrews.ac.uk> Joe Edwards <80713360+Joseph-Edwards@users.noreply.github.com>
+Joseph Edwards <jde1@st-andrews.ac.uk> Joseph Edwards <80713360+Joseph-Edwards@users.noreply.github.com>
 Luke Elliott <le27@st-andrews.ac.uk> le27 <le27@st-andrews.ac.uk>
 Fernando Flores Brito <ffloresbrito@gmail.com> Fernando Flores Brito <ffb3@st-andrews.ac.uk>
 Nick Ham <nicholas.charles.ham@gmail.com>

PackageInfo.g

@@ -114,10 +114,10 @@ Persons := [
 
   rec(
     LastName      := "Edwards",
-    FirstNames    := "Joe",
+    FirstNames    := "Joseph",
     IsAuthor      := true,
     IsMaintainer  := false,
-    Email         := "je53@st-andrews.ac.uk",
+    Email         := "jde1@st-andrews.ac.uk",
     PostalAddress := _STANDREWSMATHS,
     Place         := "St Andrews",
     Institution   := "University of St Andrews",

ci/run-gap-testinstall.g

@@ -1 +1,8 @@
- Read(Filename(DirectoriesLibrary("tst"), "testinstall.g"));
+# Using GAPDoc 1.6.7 with GAP version before 4.13.0 causes a (harmless) failure
+# in a test file, which we work around by just deleting the offending
+# test file.
+if not CompareVersionNumbers(ReplacedString(GAPInfo.Version, "dev", ""), "4.13") and
+       CompareVersionNumbers(PackageInfo("GAPDoc")[1].Version, "1.6.7") then
+  RemoveFile(Filename(DirectoriesLibrary("tst"), "testinstall/package.tst"));
+fi;
+Read(Filename(DirectoriesLibrary("tst"), "testinstall.g"));