no special character
Merge branch 'master' into fb-comment