Merge pull request #1 from sl/plugins

Plugins
Revert "Plugins"
Merge pull request #2 from Hardmath123/revert-1-plugins

Revert "Plugins"
Remerged with upstream