Update CHANGELOG.md
Merge remote-tracking branch 'upstream/master' into my_vagrant_vcloud

* upstream/master:
  Update CHANGELOG.md