Fix typo
Update FAQ
Merge branch 'master' into sandbox