Merge branch 'MDL-64599' of https://github.com/marcusboon/moodle