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