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