allow event to be stopped
Merge branch '1.x' into gh-pages