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