[Lilypond-auto] Staging/Master Merge - James' Patchy

[lilypond . patchy . jlowe]

Begin LilyPond compile, commit: 98c77cfcf941179ec011ca0e0ada02e35ccf4d0c

*** FAILED STEP ***

        merge from staging

        maybe somebody pushed a commit directly to master?

Begin LilyPond compile, commit: 98c77cfcf941179ec011ca0e0ada02e35ccf4d0c

        Success:                No new commits in staging