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