glib: Rebase into previous.