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