Merge commit 'b204d4f12773ec67c7f0ded41cb111018f154476' * commit 'b204d4f12773ec67c7f0ded41cb111018f154476': First pass at cleaning up the gestures code.
Merge commit 'b204d4f12773ec67c7f0ded41cb111018f154476' * commit 'b204d4f12773ec67c7f0ded41cb111018f154476': First pass at cleaning up the gestures code.