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