Merge branch 'MDL-69758-master' of https://github.com/sammarshallou/moodle into master