Applying r22c1 branch mods back to the trunk.
8 files changed