nvda

20fc6ee9 - Merge remote-tracking branch 'origin/master' into try-64bit