Merge pull request #7683 from tobiasd/20190930-CHANGELOG