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

[lilypond . patchy . jlowe]

Begin LilyPond compile, commit: 9f408c3d2cfe0e3bbe0a683ff52422bd784459b8

*** FAILED STEP ***

        merge from staging

        maybe somebody pushed a commit directly to master?