Upstream changes to music-score