3.4.1 Merge conflicts

To be filled in later, and/or moved to a different section. I just wanted to make sure that I had a stub ready somewhere.


LilyPond — Contributor’s Guide v2.19.14 (development-branch).