nvda

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