Updated CHANGELOG to include master changes [ci-skip]