Reload all plugins
Merge branches 'master' and 'reload_plugins'