Merge "Remove explict use of ASCII encoding"