[Bug 226492] Merge Review: timidity++