Merge pull request #517 from Maaack/use-generic-plugin-updater