Merge branch 'MDL-67160' of git://github.com/Chocolate-lightning/moodle_forum-project