Merged trunk.