Merge branch 'MDL-63375-master' of https://github.com/syxton/moodle into master