Update CHANGELOG for 2.1