java 7u40
wildmidi
Merge remote-tracking branch 'upstream/master'