Merge pull request #589 from thess/glib2-update