Merging from 1.0 branch.