Update changelog
Imported upstream version 2.2.9