Merge branch '730-faq-move-from-website' into 'master'