Merge branch 'MDL-58952' of https://github.com/scyrma/moodle