updated CHANGELOG to match the one in master