gajim-plugins: merge in remote changes