Added entry into changelog
Fix typo
Merge branch 'master' into start_stop

* master:
  Fix typo
  Added entry into changelog