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