Merge branch 'MDL-79159-master' of https://github.com/andelacruz/moodle