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