Merge branch 'MDL-60812-master' of https://github.com/mwehr/moodle