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