nvda

e654b4b6 - Merge remote-tracking branch 'origin/master' into i6333_alignOkCancel

Merge remote-tracking branch 'origin/master' into i6333_alignOkCancel Conflicts: source/browseMode.py source/gui/configProfiles.py source/gui/guiHelper.py source/gui/installerGui.py source/gui/settingsDialogs.py source/updateCheck.py user_docs/en/userGuide.t2t