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