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