Post-merge changelog update.