fixing an assert in touchend/cancel
Merge branch 'master' into gh-pages