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