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