Merge branch 'master' of git://git.sv.gnu.org/lilypond