Merge branch 'master' into mei
WIP-MEI: Correct silly mistake

When I was squashing the previous set of commits, I made mistake.
Merge branch 'mei' of github.com:ELVIS-Project/music21 into mei