Merge with upstream.

.hgtags

@@ -125,3 +125,5 @@ f8ab14cc9d8db44db437346c4e7e46c49f3c36ca build-default-281
 33b4d07c59071d318f19f9d7993719ac0c4ca9e5 build-default-290
 d6f1f2b3bd017d58eca8d47366ed1542bd735c3f build-default-292
 01e938b89e7c693c1f4d03f0622b73fa8da4f5d4 build-default-293
+43b1c2c8dbdbaadfada80df9fde028765d170040 build-default-294
+e5e64dc86731d55ececf29a9d0707109cbee6f06 build-default-295

Morris/HighlandMaryHighlandMary.abc

@@ -11,7 +11,7 @@ P:A
 D2 | "G" G2 AG FE D2 | G2 AB "C" c2 Bc |\
      "G" d2 de "D7" dcBA | "G" GABG "D7" D2 D2 |
      "G" G2 AG FE D2 | G2 AB "C" c2 Bc |\
-     "G" d2 de "D7" dcBA | "G" G2 "D7" F2 "G" G2 D2 ||
+     "G" d2 de "D7" dcBA | "G" G2 "D7" F2 "G" G2 ||
 P:B
    "G" GABc "D7" d2 d2 | "C" ed cB "D7" c2 Bc |\
    "G" d2 de "D7" dcBA | "G" GABG "D7" D2 D2 |

Morris/JennyLind.abc

@@ -8,7 +8,7 @@ Q: 150
 P: A
 "D" F A "G" G B | "D" A f f/e/ f | "A7" G e e/d/ e |\
 "D" F A d A/G/ | "D" F A "G" G B |
-"D" A f f/e/ f | "A7" g c c/g/f/e/ | [1 "D" d3 A/G/ :| [2 "D" d3 ef ||
+"D" A f f/e/ f | "A7" g c c/g/f/e/ | [1 "D" d3 A/G/ :| [2 "D" d3 e/f/ ||
 K: G
 P: B
 |: "C" g f e/g/f/e/ | "G" d B B/A/ B | "D7" c A A/G/ A |\

Morris/MountainGoats.abc

@@ -0,0 +1,15 @@
+X: 1
+T: Mountain Goats
+C: Ed Pritchard
+P: A.(AB)4
+M: C
+K: G
+L: 1/8
+Q: 130
+P: A
+e^c |\
+"G" dBFB DGBG | "Am" cBAc "D" F2 FE | DFAB dcBd | "A" edd^c c4 |
+"G" dBFB DGBG | "Am" cBAc egfe | "G" d^cd=c BADF | "D" GDBA "G" G2 ||
+P: B
+"G" [AB,]2 AB "D" AFAB | d2 "C" c2 [cE]2 | E2 "C" FG ABcA | "D" e2 d2 ^c2 =c2 |
+"D" d2 AB AFAB | "C" c2 A2 e2 e2 | "D" d^cd=c BAGF | "G" GABd G4 |]