nvda

7ecb8de3 - Merge branch 'master' into beta