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