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