Merge branch 'master' into lilypond/translation