nvda

6994b353 - Merge remote-tracking branch 'origin/master' into fix-10940