Merge branch 'mpusb'
authorKeith Packard <keithp@keithp.com>
Mon, 7 May 2018 16:53:52 +0000 (09:53 -0700)
committerKeith Packard <keithp@keithp.com>
Mon, 7 May 2018 16:53:52 +0000 (09:53 -0700)

Trivial merge