Merge branch '3.3.x'
Merge pull request #6837 from battye/ticket/17157 [ticket/17157] Fix for allowing user to see search results for topics if f_list_topics = yes