Merge branch 'for-4.14/wacom' into for-linus