Updating with latest changes to upstream master.
Updating with latest changes to upstream master.

GNOME/gnome-characters,GNOME/gnome-characters,GNOME/gnome-characters,GNOME/gnome-characters,GNOME/gnome-characters