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