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