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