Update CHANGELOG and version for 2.1.1.