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