Merge branch 'MDL-69758-m38' of https://github.com/sammarshallou/moodle into MOODLE_3...