Merge branch 'MDL-49701-28' of github.com:lameze/moodle into MOODLE_28_STABLE