Merge changes from 1.0.x repo.