updated CHANGELOG to release a minor patch instead of a new release
Merge branch 'master' into 1.1