nvda

4c6f1a27 - Merge branch 'master' into t4838