carbon2-commit: Merge with trunk.