ChangeLog: update
Merge branch 'master' into far3

* master:
  ChangeLog: update