Avoid timing out on USB configuration.

Fixed #115.
Merge branch 'next' into v4.0