added a rescue to fall back to guess if guess2 is deprecated in NFK
Merge branch 'ruby-2-encoding-fix'