Merge branch 'MDL-59599-master' of https://github.com/Kathrin84/moodle