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