Update CHANGELOG with release in progress [ci skip]
Merge branch 'master' into 17-event-delegation
Update CHANGELOG #17