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