Merge branch 'clickpad-improvements-v2' of git://people.freedesktop.org/~jwrdegoede...