nvda

e6ceb898 - Merge branch 'master' into t2295