Merge branch 'for-4.0/upstream-fixes' into for-4.1/wacom