nvda

e7b6a93a - Merge branch 'master' into next