Merge branch 'MDL-48572' of git://github.com/rlorenzo/moodle