Merge branch 'MDL-57618-master' of git://github.com/cescobedo/moodle