changed unload path to not segfault if a plugin is NULL at unload #327
Merge branch 'plugin' into backup