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