Merge improvements from 1.x branch for CHANGELOG.