Merge branch 'master_testsuite_faq'