Merge latest StretchySRB changes.