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