Merge Michael Dicken's USB fixes after rebasing on maint