[mingw32-glib2/f15/master: 2/2] Merge branch 'master' into f15