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