nvda

8d34712a - Merge branch 'master' into t2295