Fixing iconv deprecation warnings
Merge pull request #2120 from daviddavis/temp_1367273302

Fixing iconv deprecation warnings