Merge branch 'MDL-69695' of https://github.com/paulholden/moodle into master