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