This perhaps breaks the "one thing at a time rule", but seems better than leaving the changelog pointing to nothing. (cherry picked from commit 8c5129bb51)
8c5129bb51
