Pulling glib from upstream.