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