Better handling of touch gestures
Merge branch 'master' into squares