Merge branch 'MDL-38350-m310' of https://github.com/sammarshallou/moodle into MOODLE_...