Merge branch 's7_MDL-9376_qaforum' of git://github.com/dongsheng/moodle