Bring History changes from 0.4.x branch
Update CHANGES to reflect commits since branching