nvda

0e69463a - Merge branch 'master' into threshold