Merge branch 'master' of github.com:wajam/nrv
Merge branch 'master' into olivier-value-dual