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