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