Merge branch 'MDL-49354-28' of https://github.com/mtavella-netspot/moodle into MOODLE...