nvda

afc72bcb - Merge branch 'master' into t1410