nvda

c1e50541 - Merge branch 'i6099-useWxSpinCtrl' into next

Merge branch 'i6099-useWxSpinCtrl' into next Re merge to next after merging in master. Conflicts: source/gui/nvdaControls.py source/gui/settingsDialogs.py