midi updates
ULONG_LONG for osx
Merge remote-tracking branch 'upstream/master'