Merge branch 'for-4.3/upstream' into for-4.3/wacom