Forgot another place to encode as ascii...
Merge branch 'master' into staging