merged GLIB changes from the main dev repo blazf/glib