Updated ChangeLog
Merged with 4357:d45860c0874d