Merge branch 'wacom' into next