nvda

8e723342 - Merge branch 'master' into beta