Adjust CHANGELOG for 2.1