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