Merge branch 'MDL-30431_wiki_comments' of https://github.com/andyjdavis/moodle