Encoding fix attempt.
Back on the tracks.
Merge remote-tracking branch 'origin/master'