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