Cleanup
Merge branch 'master' of github:IntegralSoftware/EventDispatcher