Merge branch 'MDL-47555' of https://github.com/rlorenzo/moodle