Merge in trunk.