oops, fixing for remove_event as well (IE!)
Merge branch 'master' into gh-pages