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