Merge branch 'MDL-70340-39' of git://github.com/jleyva/moodle into MOODLE_39_STABLE