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