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