Fix in case there is an encoding problem - at least avoid crash
Merge branch 'rails-3.2' into uiuc-connections-rails-3.2