commit: Merge with trunk.