(from AES) Merge pull request #2556 from datawire/esmet/changelog
(from AES) Merge pull request #2556 from datawire/esmet/changelog

Hack on the CHANGELOG
datawire/ambassador,datawire/ambassador,datawire/ambassador,datawire/ambassador,datawire/ambassador