Fix special characters accidentally replaced with "?"
Merge remote-tracking branch 'origin/master'