Merge branch 'MDL-53562-forum-reply-re' of https://github.com/brendanheywood/moodle