change implementation of multi measure rests
Merge branch 'mmrest'
small build fix