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