preventDefault bug fix

event.preventDefault() added to mouse and touch down
too early for that
Merge remote-tracking branch 'upstream/master'