fix wrong single quote encoding
Merge branch 'master' into advanced_varname