Update with upstream

Upstream branch nopanic contains API changes to get rid of package-crossing panics.