Merge branch 'mpusb'