Merge pull request #2085 from dlobo/EncodingFixes