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

[lilypond . patchy . jlowe]

Begin LilyPond compile, commit: 2f0c6eb19208485a86d3416db3f3640a1d54752a

Merged staging, now at: 1523a68c9838549a9ca06b2965c3b5fc5b2253df

        Success:                ./autogen.sh --noconfigure

        Success:                ../configure --disable-optimising

        Success:                nice make clean -j6 CPU_COUNT=6

        Success:                nice make -j6 CPU_COUNT=6

        Success:                nice make test -j6 CPU_COUNT=6

        Success:                nice make doc -j6 CPU_COUNT=6

        Success:                pushed to master