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