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