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

[lilypond . patchy . jlowe]

Begin LilyPond compile, commit: 618c40b6b8769028ce018c8fbfe550ef1fe88113

*** FAILED STEP ***

        merge from staging

        maybe somebody pushed a commit directly to master?