Merge branch 'MDL-62026-master' of git://github.com/junpataleta/moodle