Merge of the release22 branch changes back into the trunk.
7 files changed