Ensure that event is canceled when handled with a modifier
Merge branch '1.x' into gh-pages