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