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