Fix issue with commas in NATO.
Fix another bug in nato related to modified keystrokes.
Merge branch 'master' into windowsServer