Merge branch 'MDL-59169-master' of https://github.com/nwp90/moodle