nvda

a70e9822 - Merge branch 'master' into next