nvda

cabc566e - Merge remote-tracking branch 'origin/master' into 64-uninstall-cleanup