See https://savannah.gnu.org/bugs/index.php?54191
This is also applied in branch step-cdda-lib-patch (I had meant to start out with the patch committer's name stef, but made a typo). If I don't hear comments to the contrary, I'll merge this into master in a couple of days.
