Failing test for #2555
Fix FAQ 500
Merge pull request #2556 from gittip/fix-faq

Fixes #2555