Merge revisions 8678-9423 from SourceForge main/trunk