Merge branch 'MDL-48723_master_forum-plagiarism_errors' of git://github.com/colin...