Merge branch 'MDL-68551' of https://github.com/Neosi/moodle