Merge branch 'master' into usbkb_sauter