Merge branch 'MDL-55742-master' of https://github.com/xow/moodle