Merge revisions 9423-9515 from SourceForge main/trunk