I will not commit to pull.  Changed the acceptable values view controller to use the long names.
Merge remote-tracking branch 'origin/master'