Backported pull request #375 to 1.0 branch
updated CHANGELOG