Merge branch 'MDL-60738-34' of git://github.com/jleyva/moodle into MOODLE_34_STABLE