Merge branch 'MDL-68569' of https://github.com/paulholden/moodle