Merge branch 'master' into for-5.4/logitech