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