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