typo fixes
Merge remote-tracking branch 'origin/social' into pu