Better handling of touch events
Merge branch 'next-demonic' into next-eve