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

[lilypond . patchy . jlowe]

Begin LilyPond compile, commit: 2f0c6eb19208485a86d3416db3f3640a1d54752a

*** FAILED STEP ***

        merge from staging

        maybe somebody pushed a commit directly to master?