Oops, forgot touch events.
Merge branch 'master' into gh-pages