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