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