Fix for bug #2200.
Update ChangeLog