更新ChangeLog
Merge commit '0be102b0c50600b6d42db2b0cc651180b9a7a49d'

* commit '0be102b0c50600b6d42db2b0cc651180b9a7a49d':
  更新ChangeLog