Merge branch 'MDL-53671-30' of git://github.com/dpalou/moodle into MOODLE_30_STABLE