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