Merge branch 'm27_MDL-46197' of https://github.com/totara/moodle into MOODLE_27_STABLE