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