nvda

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