Merged trunk.
Merging trunk.