Merge branch 'origin' of http://lilypond.org/vc/lilypond into master-hanwen