nvda

b86cfd1c - Merge branch 'master' into t2975