nvda

3b5d32c0 - Merge branch 'master' into t1353