Sync with upstream pyramid_extdirect
Sync with upstream pyramid_extdirect

While we're at it, fix error handling with newer pyramid_debugtoolbar.

unikmhz/npui,nikitos/npui,hermes-jr/npui,nikitos/npui,hermes-jr/npui,nikitos/npui,hermes-jr/npui,hermes-jr/npui,nikitos/npui,unikmhz/npui,unikmhz/npui,unikmhz/npui