nvda

aad831cf - Merge branch 'master' into t3370