Fix typo in FAQ
Merge branch 'master' into zertrin-custom