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