nvda

0e6271a0 - Merge branch 'master' into windows10s