Merge "MIDI: Fix some javadoc spacing"