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