Optimized plugin/polyfill inner classes and events
Merge pull request #3885 from pjackson28/optimizepluginnamesevents

Optimized plugin/polyfill inner classes and events