Fix type erasure problem!
Merge branch 'olivier-fix-edge' of github.com:wajam/nrv into olivier-fix-edge