This change does not itself get a ChangeLog entry. From-SVN: r100149
files ChangeLog-1998 and ChangeLog-1999. This change does not itself get a ChangeLog entry. From-SVN: r100129