nvda

d05058f0 - Merge branch 'master' into next