Merge branch 'MDL-43178_forum' of https://github.com/andyjdavis/moodle