Merge pull request #10441 from neheb/glib