Merge last minute 2.2c1 changes from branch to trunk.
2 files changed