Merge latest trunk.