Merge branch 'MDL-69466-master' of https://github.com/JBThong/moodle into master