Merge branch 'wip-gobject-introspection'