Merge branch 'smcv/glib-xfail'