nvda

1e0f8f5e - Merge branch 'master' into t1410