Fix merge errors on CHANGELOG

王权利请求将github/fork/mavimo/patch-3合并到master

Created by: mavimo

During merges (d554070a and 497fd75d) changelog was "damaged", I restored the tagged 7.9.1 and added the required changes about 7.10.0 (unreleased). I think we need to ensure all PR are rebased on master before merge.

合并请求报告