update changelog
fix typo in changelog
Merge branch 'master' into stable

* master:
  fix typo in changelog
  update changelog