Merge branch 'MDL-34160-forum-subject' of https://github.com/brendanheywood/moodle