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