Merge branch 'MDL-58970-master' of https://github.com/abias/moodle