Merge branch 'MDL-58174-master' of https://github.com/abias/moodle