carbon2-commit: Merged with trunk.