* Merged trunk to cf (revisions 2662 to 3077)
* Merged trunk to cf (revisions 2455 to 2655).
* Merged changes from trunk to cf (revisions 2093 to 2269).
made a copy