Sync CABAL branch with release-1_0 branch.

No match.