Merge branch 'plugin' into domainsocket