Merge branch 'MDL-73008-master' of https://github.com/jleyva/moodle